Slightly better entry and entries pages