improve dashboard view and state