Fix ui

This PR fixes a couple of issues related to the UI and dialog box