fixed some ui and navigation issues