Fixed display issues at index