adjustments on scapegoat adaption
improvements on breakpoints and margins