Added remove item function
Fiddling with highlighting