Minor changes of the ui