Adding cluster select and upload + submit features