bug fixes for new margin collapsing
fixing margin collapsing bugs