Improved field names and added tests
Added views and more controllers