Positioning and sizing fixes