layout fixes for #292 

see #292 for comments on this