Cleanups on the screen css code
First merging of editable scene