Fixed keys not firing button clicks
Changed Map format to include start and size