Improvements to expose data screen