Fix misplaced elements