Minor UI Update & Class Inheritance Implemented