Series of design tweaks