Design Changes from the dise-ui repo