Fixed bug with cancel and done button in navigation bar