rejiggering layout for more column y yay
merge in