Update manifest to comply with latest specs.
Fix layout.