Remove buttons and fix container selector

If this code isn't going to be used in the future can we please remove it.  There's no point in having commented code in the system when we have a repo we can recover from.

Thanks
Westin