Clean up, split out static content to Pages