Form styling, minor fixes