Changed the markup of index template