Use Variant model to simplify result modal setup

Signed-off-by: Don Naegely <naegelyd@gmail.com>