Fix Login, FieldList & Button Group