Also, the css selector cleaned up a little bit and some locator modified to be nit.