Slight tidyup on entity page