Added caching, store controller and some styles