Short URLs
Merge branch 'newdesign' I'm done BTW