Edit nav buttons, refactor, add comments