Static pages and base page fixes