Made some design tweaks