Fix minor issues in the UI