added icon , modified javascript and views
fixed merge conflicts