font awesome added, some code cleaning