more layout work
merge trouble