Updated views and some redis caching