Dashboard

Integrate dashboard theme into master