Moved screen switching logic up to main controller through ng events