Key navigation, and better drawing code