Moved the navbar code to the individual files