Template much improved, map page themed