Code improvement and bug fix with multiple (using the arrows to walk through the list of options