More work on getting the dashboard working