Swap iron and tin upgrade levels
Fix a few visual issues