Project Screen improvements

(cherry picked from commit 3d0609699d424d58a0763525119bb8552933883a)