Added new classes and modified UI.