Updated UI and added comments