Image swap and more responsive tweaks