bugfix ui issues
refactor store

Co-authored-by: fsdavid <daviti1@mail.com>
Co-authored-by: Xiao Gui <xgui3783@gmail.com>

Co-authored-by: fsdavid <daviti1@mail.com>