Started changing the UI a bit