Take out link and x, refactor toolkit styles