Fixed merge conflicts. Updated cache manifest.
Vertical align