Updated form formatting including button styles