Updated and Cleanedup Form Styles