Make image support better, fix arrow styles