Remove unused code
Add navbar controller