Eliminate dead code
Fix link from dashboard view to directory view
Merge branch '2.0'