last css changes and html changes before merge