Improved dashboard
Merge branch 'couch-1.6-compatability'