Added pay screen
fixed conflict