Remove navigation controller and simplify delegates hierarchy