Add navbar variables and improve comments.