Refactored. Changed icons,.