reworked buttons hopefully