Adjustments in layout and Index