Update Manifest, layout and libs