Good news!! I got it to work! I tightned up everything when I got home and turned back on the switch and it worked. Here's the pic of it after wiring it as mentioned above.
So as I mentioned in post my last post yesterday, I have the other problem where my GFCI is not working. I've rewired it and orignally, the box had four wires coming out of it, two black and two white. I verified that one of the black wires was hot and put that into the Line Hot input and the other black into the Load Hot input. I also put the other white wires into the other two neutrual inputs and finally wired the ground to the GFCI.
The green light comes on as seen below when I supply power to the unit but when I try to test the outlet, my tester gives me nothing at all. Any suggestions?