Finished transitions for 2/3 views

Finished transitions from the main screen and workstation shortcut