More changes to app