cleaning code

Signed-off-by: MwangiKevin <mwangikevinn@gmail.com>
dashboard ui

Signed-off-by: MwangiKevin <mwangikevinn@gmail.com>
Merge branch 'develop' into feature/highmaps