index and navigation improvements