Fix analytics script issue and tab index on modal close link