BlackBerry revamp to take on iPhone