Okay, the weapon system is in fact not perfect yet ... and with your second solution your thoughts seem to go in the right direction

Germanuunkol point is really good: With highlighting boxes you also prevent that somebody takes accidentally the wrong box and the nice building breaks down ^^