small changes to html layout dashboard
merge conflict solved