missing edit icons added, extra smarty3 stuff gone