Updated mapping model
Add some CSS