Update

- removed unnecessary menu items
- changed navigation
- import: prepared for overriding files (not completed finally)
- minor UI changes
- minor bug fixes