Added changes to workspaces and layout