android and iOS templates updated