added keywords again to form modul files
Updated form modul with features from the advanced form modul