fixed bugs in layout logic and removed Sass from theme
upgraded to latest hybrid core