small ui fixes
Merge branch 'feature/folder_structure' into develop

* feature/folder_structure:
  small ui fixes