UI addings and improvment