Fix top navbar display issue
Merge branch 'develop' of github.com:daiweilu/infm700-project-3 into develop