Fixed shortcut issue introduced with fragments
Small fixes to widget and shortcut