Fixed menus and labour form to make use of the ProblemType lookup domain