Moved oval shapes to rectangles in some layouts
Properly repositioned some images