merge espen css changes