Improve key event handling
Settings display