improve looks and change text + icon