Changed the done and cancel buttons they should not overlap anymore