merging fixes for full-screen width