Image swapping and fixes