Part c added more UI functionality