More object window improvements