A few styling bug fixes