Added tabs in demo

Added tabs in demo to really show the page switching in action and
corrected a few minor bugs