fixed a few navigation bugs
fixed hide button bug
fixed button gap
fixed merge conflicts
fixed merge conflicts
Merge branch 'feature/navigation-improvements' into develop