Fixing alignment issues; adding some padding for breathing room