syncing css updates from develop branch