case 2849 - Indentation, elements' re-arranging and .js refactoring for unique ids.