Add Input window enhancements