Iteration 2 UI Changes