removed sass cache
update
Merged
Fixed some minor bugs and layout issues