Moar changes.
Merge pull request #8 from fixwa/user_dashboard2

Moar changes.