Deal with weird padding issue when collapsing and expanding