Index and Map Fixed

Both index and map are now working, however the map is having a hard time loading and needs to be looked at.