Touched up some elements and tweaking a little bit