refactor, string cleaning, icon change..... -- kevin