Basic testing of controller + refactoring + removed 1st screen