Fixed some selection issues

Still need to allow selection navigation by arrow keys