Remove alternatives when a selection is made
Event refactor
Latest fixes from gh-pages