fixing original layout structure