added survival analysis
fixed a conflict
updated survival analysis UI