added browser history
Merge branch 'history' into layout2
adding history functionality