Some issues from merging fixed

Some issues from last merging being fixed.
kind of popup asking the user to downlaod the latest version of Firefox
Added.