Small mods to add entry layout