Moved some headers to the header bar and page title