Improve dashboard