event handler minor refactor; css polish