Layout fixes from Tom's feedback