Updated error and navigation