Updates to ui and mech_eap