merge of the Overlay and the UI repositories