Stopped event bubbling
Changes
formatting
Fixed Bug in Branch
Fixed conflict