fixed padding and margin issue