Remove width/height from container - excessive and extraneous
Tweak for border removal