Made UI slightly more robust