aded icons, fixed bugs