fixed issue leakage and did some css