Sizing fixes based on feedback from designer ;)