Added code to clean session messages and re-ordered managers render