Remove buttons and fix container selector