user dashboard complete
merge with sophie