added form styles, icons and restructured classes