More additions to the UI and fixes