final UI class changes