Merged Code
Made UI Changes