Started making the UI a little more useful