Refactory code and add cool icon