Fix navbar and add Analytics