Fixing Back buttons and dictionaries