Add changes to container display
Removed typescript
Merge branch 'javascript' into dev
Merge branch 'dev'