2nd pass in risk wodget(s)

Signed-off-by: Predrag Kanazir <predrag@arraystudio.com>