CSS > SASS migration + Bug fixes