fix issues after with merge.
update of dashboard functionality