Initial app changes

App version 21