Fixing rendering; some event issues