Minor updates with UI and messages