added margins and modified borders