Polished index layout design
Continued polishing layout design