Navigation fix and index views tweak