updated design an navigation logic