Pushing to Staging

* Static Pages story
* Refactoring of specs
* Optimization
* Misc. updates