added several new screens and functionality