Separate index views

Needs a minor headers and methods rename.