added UI labels and code names