Updated views and some redis caching
resolve merge conflicts