implemented the change page on tab click
resolved conflicts
Merge pull request #21 from SCS-hackers-group/nico_branch

Nico branch