improve entry layout