added and implemented simple_form and cleaned up some markup