Structure + mainrect update