Some code formatting
Some code formatting
UI class updated