Tweaks and additions from bootstrapping on another machine
Switch around workspace ordering and numbering