minor update to handle largish workspaces, still need to add some spinners though