Bug fixes, icons added

Minor changes