Feature/issue 31 opion redirect screen