Fixed ui conflict and Fixed UI options