Fix solution (place highlighting above row and column coloring). Also refactoring.