PLAT-1656 reset recorded entry id, fix layout issues