adding format class
Changes and commenting added to the UI