Layout repared