Fixed dining hall page
Fixed merge conflicts
Fixed merge conflicts