Clean up form user interface, added groupings to more cleanly handle review sections