BISERVER-8708 - Updated tree view to list. Updated options order