layout tweaking inline with Stephen's design update