Completed support for Companies in the Dashboard