Added drop-down selector to the selection panel
Added helper functions and some cleanup
Merge branch 'normalisation'