combined map and some css changes