Formatting
Cleanup
Implemented initContained()
Removed unneeded buttons init code that is now done by new initContained() method
Removed unneeded buttons init code that is now done by new initContained() method