return to master view with callback
some fixes
@ios fixed animation issues