Change color & Fix index bug