Further optimizations to the file window