Layout tweak.
Overhaul of capability interrogation, addition of policy support.