forgot method
clean up layouts
clean up java