Added icon and fixed titles