New and improved static page
New and improved static page
fixing merge conflicts