A large number of layout fixes.