some fixes in the UI