Necessary fixes before more refactoring
Pushing to staging
Refactoring away
More refactoring
Fixed week link width