layout and sizing fixes