[#65339490]make layout fluid
Merge 65339490-screen to master

[Completes #65339490]