Fixed index & style changes