Fixes to the Entry pages