Split form into partials, added controller test

Identation of controller specs

Refactoring the branch