Bug fixes - positioning and sizing