Added buttons + removed old ones