Some formatting fixes and event partial rendering