several adjustments, and icons added