Tweaked index layout