layout fixes
Complete layout