Brian's UI changes