some fixes for the ui improvments, especially annotations related