White space fixes and fiddling with save event