fixed selection screen cleanup
Merge branch 'master'