Added UI elements and updated manager classes