FEND-1144. Initial pass for the new screen