added state whitelist; fixed modal design