+ updated index to match with layout
+ add code to AppLayout