Added selection highlight, basic level tracking