Page bar refactor