Merge pull request #2 from stephandev/master

New page control
UI fixes
Merge pull request #54 from mshamash/master

UI Fixes