Fixed nav layout bugs