Continuing work on UI and fixed sass-cache