Reworked much of the UI