UI changes by dabre