Minor layout tweaks - more needed!
cells not behaving themselves… argh!