Create basic layout for static pages, improve testing