Added build stuff
Cleaned up row selection a little bit