Some changes
Add some navigation