ux menu/ functions
fixed merge error