Add a StaticPages controller
Finish static pages
fixed conflict