Final changes

Made some final changes to the app