More Refactoring.
FIXED: Shortcuts does not work in FF.