- more experimenting and improvements of the keyboard navigation
- yet another additional cleanup pass aswell