add static pages and improve functionality