Fix nav layout and added comment section