Messed around with the UI a little bit