Form layout and css fix