index layout improved