putting the app into shape finally