UX updates to prepare screen
Merge branch 'mass_prepare' into testing