Static pages

Code refactoring and minimal page editing.