Fixed Back Button Bug