Fix issues with margin/border/padding and alignment