Finish feature. Glitches and bugs solved. Can't add now calculated question icon because internal technical reasons - refs #7212