layout fix and final index