fix move implementation & UI changes