removed old buttons
almost working