Layout

merged working with master ... all things match