Progress in Workspace main layout