Made progress on dashboard