Sync repo with changes

The past few months I worked mainly offline so the commits were messed
up. This is a full sync to the latest app version (2.0.1).