using new layout, enhance logs