Moved back to using simple_form and some changes to layout.