* Update buttons & improve UI