necessary style changes for CDB-1822
Merge branch 'develop' into CDB-1822
changes for creating window done