Cleanups to form labels, button positioning
Less/css tweaks