Enhanced with Dashboard functionality

+ fixed the html list