Fix layout

fix layout to fit new jade standards
Merge branch 'fix_layout' into dev