David - Final changes to app