Revert 6b8cd98..003cc8a

This rolls back to commit 6b8cd986970c42d17621d88ec3fff1238f58ba95.
more fixes
checkout page text