Edited some more things

Moved search into the index for now