Final touches on app