Fixed navigation issues + cleanup