Content Screen layout completed

without layout bugs.
Test Commit with major version