Continue updating to use listview instead of spinner for primary options