UX updates to prepare screen