added new ui classes
Standardized the coding