refactoring for container template, started the work on container menu
Merge pull request #29 from Leon-G/master

refactoring for container template, started the work on container menu