UI Changes requested by cam and trey