Fixed padding and margin issues