Fixed a bug in index and small visual change