HW 5: Added UI