Added TOP and revised spacing

Also changed Home controller to use updated index and constraint sprocs.