Merge pull request #171 from xen/master

Merge
Merge pull request #172 from xen/dashboard-single-line

Merge pull request #171 from xen/master