style form to match mockups
fix merge conflict