Done user dashboard changes

Merge user dashboard changes from sushil to Sprint 5 branch