Made a few changes to the app