Improved entry type selection design.