refactor + distribution page (not done)