Scss fixes

final merge!