Crying in the elevator

This problem has vexed me ever since we moved to Milwaukee. We live near a MetroMarket grocery store that has 2 levels, and is attached to a 4 level parking garage. You can enter the 1st floor of the grocery from the 1st floor of the garage, and the 2nd floor of the grocery from the 3rd floor of the garage. The 2nd and 4th levels of the garage require you to go up or down by elevator or stairs to access the store.

They've attempted to organize the information on the buttons of the elevator (See the photo included). I feel like I'm being subjected to a timed logic test every time I'm in there, and it's progressively more embarrassing when I get it wrong, as I've been going to this grocery store for a few years now :(.

I think the issue is that you are supposed to extract two types of information from one interface, and they are linked together in a confusing way. The letters A, B, C, and D relate to the parking garage, and the numbers 1 and 2 relate to the store floors. You are supposed to compute that floor 2 of the store is on level C of the garage. They've tried to remedy this by adding stickers that say "parking level 2" and "shopping level 3" by the C2 button. Then another "parking level 2" is near the "B" button, but not next to "B", so it's cognitively difficult to link up.

This is my attempt to separate the information for quick readability:

• Setting both shopping and parking level identifiers as numbers. 

• Separating the floor markers from the parking level markers. 

• Adding a "P" on all parking level markers, to distinguish them as "Parking". 

• Branding the grocery store markers, to stand out as a different type of information. 

Now if only I could sneak in there one day, Banksy-style, and make the update :) Let me know if this solve makes sense, and if you see a better way to do it!