Split distribution selection and display

Some display may differ, but they are easy to fix.