Updatd UI for Space, and other minor tinkering