dashboard maj

Few modifications before the merge.
maj dashboard