Moved navMargin logic to route =(
Adding TODO for self