Add risk parameters to main widget and use correct titles [story:42101093]