tweaks,
removing memory leak
Some buttons reworked