design tweaks and fixes