Increased efficiency a bit and added tabbed navs, still a long ways to go before it is polished