refactor and tweak some pages