0.0.7 Added Dynamic Navigation