add event button + minor changes