Refactored the events
Using browser History for user selection. Closes #11