WIP: UX improvements, working on wavesPicker for upload