Added Menu building
Refactored container addition