Improving design (add better icons with more meanings)