Some quick fixes the the ui.