layout fixes, import updates and logging