Update dashboard
Import fixes, minor improvements