fix navbar
fix layout
fix layout