Added yellow borders and fixed selection problem.