Improve the UI a bit. Adding shortcut and formatting hints.