Fixed nav to be more dynamic. Added features