Handle errors better & tweak margin