Added more static pages and refactored code