design improvements: margins + input whitelist