Reorganised and added static pages