Sweeping view and controller updates to fix issues