design tweaks and validation fixes