Merges correctly
Fixes shifting content on window resize and centers content
Fixes mismanaged merge