Last few styling changes for now