Clean up views more, fix ng-include issues