#border & image fix
#border and image fix