looks like the rendering bug is fixed, changed to scss and lots more
Merge branch 'design'