Fix style issues with some forms