Wrangled simple_form a bit