Workspace Layout improvements