GUI Changes redmine issue 2686