Dashboard reworked

by Kenneth Del Prado