Fix production server problem. UX fixes