New buttons text updates other fixes