Items left counter working + fixed issue with in-place editing