Fix status layout issue
Fix afterDispatchResponse firing at wrong time