Minor UI and Backend Changes