Update fix layouts and image resizing