Fixed feed page, student dashboard
merged changes