Improvements: navigation and FB integration