More content fixes
Started cleanup
Added chat back