Fixes various problems with the navigation
Adds wrapper to feature in order for it to remain legible