Merge from nex and fixed few bugs from intern dashboard