More UI work and more basic functionality