Made UI changes and backend code cleanup