Tidyed up some UI