Project Screen improvements

(cherry picked from commit 3b3e79f4d5734ba43e39dd38bfa5ae5567c7aba3)