Improved styling and removed hardcoded widths