Refactor and page redesign