Organized the SASS files, updated Activity to match composition