Added icon, reogranzied templates folder, fixed some bugs