fixed navigation issues and identation