Fixed issues in Firefox browser