Move ribbon to the right
Fix add_task
Merge branch 'master' into staging