design tweaks & polish