improve UI
improve UI
use references for action calls