Refactoring for first 4 pages integration
Merge branch 'develop' of https://github.com/nagarro-gde/GDE into develop