Changed some of the style (almost done.... need more pictures)