Add a StaticPages controller
Finish static branches