Text color and index button border fixes