Added some more tabbed goodness, and some asthetic changes