Merge pull request #161 from jerv13/master

Remove buttons and fix container selector