fixed merge and extracted css to seperate file