Styling fixes including large form updates