Minor mock-up tweeks.