Add margin and border for images