some small last minute css changes
merging conflicts