Update User Interface. Added new Classes.