final components and navigation issues