fixed the margin+padding problem