Update navbar links
Merge front_end branch with master