Fixed building pic, builder positionement, and clean code