fine tuning person dashboard
fixing merge conflicts
Merge branch 'stylestwo'