style fixes and event populate fix