Bugfix + preparation for better form
UI update
Small style fixes
Last fixes