Reworking some of the UI again