add: menu and navigation
clean: various