Dashboard changes to work properly with the whole system