fixed button bug, added formation options