Refactor to QupActivity superclass
Fixed page indexing