Hopefully fixed the hoverable image tag thing
Merge branch 'layout' into develop