Base: First attempt at fixing content moving on page change