Refactor situatia-pages layout as well