Small fixes and brings up spinner options when adding