Flatten UI some more