UI Changes, removed unused code.