595-21 Create Type selector page
Merge branch '595-21'