Formatting and layout fixes (Change to simple_form)