Bugfixes-1

Form spaces and styling bugs