updated css to sass and combined js