Panel Map: added, a bit of formatting too