Refactor spec and code
Add navbar