BUG: Change layout of map key