move index to layout
clean up app