Add layout icons, reorginized workspaces