Better margins & border