refactored code to account for sass framework changes