More work on ElementWindow