Made stuff look consistent.
Killed the dashboard.
Fixed sum moar merge conflicts.