Fix up some EE layouts
merge master