index error fix
remove index fix
Merge branch 'filling-in-layout'