#44 #45 Updated UI and fixed edit list spinner