fixed some issues, restructuring sass