Minor improvements on behalf of designer