general fix in codestyle
sub-menu in the header fixed
structureview controller reverted
Merge branch 'APD-header_fix' into develop