iPad inital support, buttons fall up and clean up code