Work on user history, added nav buttons