Made components navigation dynamic