various corrections for the UI