Did some clean up and added some JQueary for styleing