Modified the UI; removed local refs