Lots of style changes and more content added