Updated architecture index and layout