design tweaks/bug fix