Added folder icon; improved visualization; cleaned up code