Fix key handling
Many rendering changes