#214 Re-ordered the select options screen
Removed unused entries
Updated FEST tests to match