Some UI refactoring
Removed FormBuilder Stuff