Selection page and little modifications