improve buttons order