Reworked buttons , to solve bugs