added the new event modal along with navbar
merged modals with most recent stuff.  preston will now merge