fixing app toggle/field chooser buttons order