added widgets to show pages
cleaned up some views
merged branch-r with master branch