implementing new method to keep track of page index
Merge branch 'development' into feature-gifdownload