Tool bar and icon to menu added
Merge conflict resolved