Updated form style and layout