Final updates to app
One more final :)