League page working
Bug fixes
Merge