Fixed issues with iOS loosing object connection

Added edit and done for editing