Updated forms and styles