Cleaning up composing UI

props @hugobaeta