Cleaned up views a smidgen and added API to index