layout tweaks and logging