added formtastic gem and tidied up