Imporove workflow screens