Added UI elements, added functionality for UI elements