[Chaitanya] Added moving objects, buttons, fixed up code