Fixing up the UI a bit to be more fancy