Fixed desing problem with padding and margin