Various layout and sizing fixes