few more minor design tweaks