Continuing some refactoring work on codebase
Fixed ability to transfer to a new screen