Updating app
Cleaning up templates