#2197: Adjustments to positioning of elements.