Added new screens and action sheet