Remove buttons and fix containe selector