Refactord with Factory Girl, added Bootstrap, added validations