Refactor features pages a bit.