Changes to display Grid Elements correctly within workspaces