layout fixes, cleanup