Fix/edit dashboard

Fix for issue #27