form styles and some cleanup