Added additional subclasses, some aesthetic ui changes.