Added UI changes and controller updates