Added inner module containers
merged and updated editor toolbar