Fixes to form look-and-feel