Started overhaul and unification of form elements