Cleaned up index and map templates