#3

nav & some fixes