Clean up nav layout