change of sidebar to subnav
Merge branch 'feature/changeLayout'