showcase view edit
merge for analitycs
Minor Fix