Revert : Display fixes (cocafe)