few bugs fixed on navigation