Added new classes to handle dynamic UI elements.