Top-nav and spinner fix