Changed Class to Classes, New dashboard and defaultLayout