Sorted Angular controllers and views, fixed routing.