fixed padding and margin issues