Merged in Jigsaw and prepared for other improvements
Resolving merge in css and scss