Play with some sizing and additional tweaks