Angular Support Added, Navigation Improved