margins and paddings fix

fixes