Fix directly fail condition; Improve UI.