Working on consistency throughout the pages