moved user status underneath avatar and updated corresponding tests