various design tweaks