Card layout clean up.