Fixes to selection page