Some code improvements
row is now selected