let highlight rectangle fit the item space
Move MapPage to a dedicated module
Update icons