User dashboard merge into master