Further work on the app