Develop

Finished merge of new relfex popup selection