Fix keys. Improve draw