merge stateUI

cleaning up