More work on dashboard + fixes.