bugfix, forgot to refactor some pages