Temp fix for sidebar overlap issue. Remine#1842.
Merge branch 'addJinja' into addJinja-ui