Last few UI updates pre-crappy MVP demo