dashboard update fixed, small refactorings