Remove toggle logic from dashboard Fixes #644

review? @mykmelez or @potch