Fixed event positioning
Minor Bug fixes and basis of event selecting with combo box
Test