Fix underline and outline issues