Nav bar cleanup