WIP: laying out wave picker more consistently on all screens