final fixes in app