Added dynamic navigation