Added some more logic to displaying the workspace and logout option