Fixed labeling and overlay issues.