Remove *.o after building
Fix layout