Initial dialog redesign commit

Not yet finished