Refactored UI objects for efficiency and organization