clean up project and fix layout error