Ux Changes and Minor Backend Changes