Improves dashboard. Fixes #14