split up sass files and fixed some bugs