Move img border and spacing definitions