added default pages
refactored most of the other pages