final fixes for the ui