Added classes for dynamic UI elements
Fixed merge issues