Added Buttons & touch functionality