fixes for the UI