MOM-47 Fixed responsive source interface
MOM-47 Minor change of code layout
Merge branch 'MOM-47_SourceResponsiveInterface' into develop