major rework by Marin - user dashboard and lots of bug fixes.
merging latest changes