Move logo to the right in base.html
Merge branch 'UI'