More Stafftext.ui changes