added "easy" button and refactored session variables to make DRY