changes fom ahahn for version r161
reorder buttons