Split form into partials, added controller test

This is-else construct can be refactored.