Continued refactoring into dashboard PORO.
Merge pull request #2 from Bantik/master

Continued refactoring into dashboard PORO.