UI modifications and bitmask composition support.

Includes Test suite modifications.