layout fixes, better delay fn