Minor adjustments due to testing and UI detail.