Revert "Move QS and Navbar to General"

This reverts commit 3487f5bcdef5192995534b62f6d206e38f3d75f2.