ERP-132 Consolidate the messages view
ERP-132 Remove some code thats no longer needed
ERP-132 Update messaegs view